Don't undo reordering if we haven't been reordering. (#346836, Ed Catmur)

2006-07-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_stop_reorder): Don't undo
	reordering if we haven't been reordering.  (#346836, Ed Catmur)

diff --git a/ChangeLog b/ChangeLog
index 622233257b4997ddec2f2ef8bcdbcbb54c40e13c..e20795822da3055aa12d0efabd64dbcbfad5d166 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Don't undo
+       reordering if we haven't been reordering.  (#346836, Ed Catmur)
+
 2006-07-17  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 622233257b4997ddec2f2ef8bcdbcbb54c40e13c..e20795822da3055aa12d0efabd64dbcbfad5d166 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-07-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Don't undo
+       reordering if we haven't been reordering.  (#346836, Ed Catmur)
+
 2006-07-17  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index c032a89238ac02bbe79681003e6a1ed86bc179ab..9ecd0806b01d4021d041061a5290af58b2e0f6ee 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2596,7 +2596,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
 
   if (page->reorderable || page->detachable)
     {
-      if (!priv->during_detach)
+      if (priv->during_reorder)
        {
          gint old_page_num, page_num;
          GList *element;
@@ -2605,8 +2605,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
          old_page_num = g_list_position (notebook->children, notebook->focus_tab);
          page_num = reorder_tab (notebook, element, notebook->focus_tab);
 
-         if (priv->has_scrolled ||
-             old_page_num != page_num)
+         if (priv->has_scrolled || old_page_num != page_num)
            g_signal_emit (notebook,
                           notebook_signals[PAGE_REORDERED], 0,
                           page->child, page_num);